Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Sat, 11 Mar 2006 14:40:33 +0000 (15:40 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Sat, 11 Mar 2006 14:40:33 +0000 (15:40 +0100)

Trivial merge